Create a merge commit